From: Alan Mackenzie <acm@muc.de>
Date: Fri, 28 Oct 2011 15:18:00 +0000 (+0000)
Subject: Merge.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~427
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e376ea4f737a9230a9767a12bdcc530da4b4da87;p=emacs.git

Merge.
---

e376ea4f737a9230a9767a12bdcc530da4b4da87